From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 16 Feb 2011 00:21:32 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2383^2~7
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5740d4abab3bcf1b2b98b725c3292046cc1f4c58;p=emacs.git

Merge from mainline.
---

5740d4abab3bcf1b2b98b725c3292046cc1f4c58